Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a new ammo type, 44 Roumain, used by the Montagne and Shadow revolvers. #3110

Merged
merged 8 commits into from
Jun 20, 2024

Conversation

Martinpachu
Copy link
Contributor

About The Pull Request

Adds a new type of ammo called 44 Roumain, an inbetween between more powerful revolvers and regular pistol bullets with 25 damage and 0 AP. Comes in rubber, hollow point and standard.

Why It's Good For The Game

Request by Rye, but also, the shadow and montagne are very underwhelming right now being basically a worse version of the Candor. This should give them a nice niche.

Changelog

🆑
add: .44 Roumain rounds! Comes in rubber, hollow point and standard, being an inbetween between regular pistol bullets and more powerful revolvers. The Shadow and Montagne revolvers use this ammo type.
/:cl:

@Martinpachu Martinpachu requested review from FalloutFalcon and a team as code owners June 16, 2024 01:27
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jun 16, 2024
@Martinpachu
Copy link
Contributor Author

WHY WONT YOU WORK

Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i made the sprites

@rye-rice rye-rice added this pull request to the merge queue Jun 17, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jun 17, 2024
…olvers. (#3110)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Adds a new type of ammo called 44 Roumain, an inbetween between more
powerful revolvers and regular pistol bullets with 25 damage and 0 AP.
Comes in rubber, hollow point and standard.

## Why It's Good For The Game

Request by Rye, but also, the shadow and montagne are very underwhelming
right now being basically a worse version of the Candor. This should
give them a nice niche.

## Changelog

:cl:
add: .44 Roumain rounds! Comes in rubber, hollow point and standard,
being an inbetween between regular pistol bullets and more powerful
revolvers. The Shadow and Montagne revolvers use this ammo type.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@rye-rice rye-rice removed this pull request from the merge queue due to a manual request Jun 17, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 18, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 19, 2024
@Imaginos16
Copy link
Member

awawawa

@Imaginos16 Imaginos16 added this pull request to the merge queue Jun 19, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 19, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 20, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
Merged via the queue into shiptest-ss13:master with commit 0b9b82f Jun 20, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
…olvers. (shiptest-ss13#3110)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Adds a new type of ammo called 44 Roumain, an inbetween between more
powerful revolvers and regular pistol bullets with 25 damage and 0 AP.
Comes in rubber, hollow point and standard.

Request by Rye, but also, the shadow and montagne are very underwhelming
right now being basically a worse version of the Candor. This should
give them a nice niche.

:cl:
add: .44 Roumain rounds! Comes in rubber, hollow point and standard,
being an inbetween between regular pistol bullets and more powerful
revolvers. The Shadow and Montagne revolvers use this ammo type.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants